Tegra: memctrl_v2: set NO_OVERRIDE for APE clients

For all APE clients (APER, APEW, APEDMAR, APEDMAW) set NO_OVERRIDE
for MC_SID_CFG as ACAST/ADAST will be setup with the required SIDs
ie. 0x7F & 0x1E.

Original change by Nitin Kumbhar <[email protected]>

Change-Id: Idec981b3537cc95dac6ec37cdaa38bc45b16d232
Signed-off-by: Varun Wadekar <[email protected]>

diff --git a/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c b/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
index bc2d7b5956bb6d9f225a12ad8bc6d9d77975314f..4d8d307cf04ef2e86cf9ebd102c19c4a9b7d3aa9 100644 (file)
--- a/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
+++ b/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
@@ -143,7 +143,7 @@ const static mc_streamid_security_cfg_t sec_cfgs[] = {
        mc_make_sec_cfg(SCEDMAW, NON_SECURE, NO_OVERRIDE, ENABLE),
        mc_make_sec_cfg(UFSHCR, NON_SECURE, OVERRIDE, ENABLE),
        mc_make_sec_cfg(SDMMCWAA, NON_SECURE, OVERRIDE, ENABLE),
-       mc_make_sec_cfg(APEDMAW, NON_SECURE, OVERRIDE, ENABLE),
+       mc_make_sec_cfg(APEDMAW, NON_SECURE, NO_OVERRIDE, ENABLE),
        mc_make_sec_cfg(SESWR, NON_SECURE, OVERRIDE, ENABLE),
        mc_make_sec_cfg(MPCORER, NON_SECURE, OVERRIDE, ENABLE),
        mc_make_sec_cfg(PTCR, NON_SECURE, OVERRIDE, ENABLE),
@@ -158,9 +158,9 @@ const static mc_streamid_security_cfg_t sec_cfgs[] = {
        mc_make_sec_cfg(XUSB_HOSTW, NON_SECURE, OVERRIDE, ENABLE),
        mc_make_sec_cfg(TSECSWR, NON_SECURE, NO_OVERRIDE, ENABLE),
        mc_make_sec_cfg(SDMMCRAA, NON_SECURE, OVERRIDE, ENABLE),
-       mc_make_sec_cfg(APER, NON_SECURE, OVERRIDE, ENABLE),
+       mc_make_sec_cfg(APER, NON_SECURE, NO_OVERRIDE, ENABLE),
        mc_make_sec_cfg(VIW, NON_SECURE, OVERRIDE, ENABLE),
-       mc_make_sec_cfg(APEW, NON_SECURE, OVERRIDE, ENABLE),
+       mc_make_sec_cfg(APEW, NON_SECURE, NO_OVERRIDE, ENABLE),
        mc_make_sec_cfg(AXISR, SECURE, NO_OVERRIDE, DISABLE),
        mc_make_sec_cfg(SDMMCW, NON_SECURE, OVERRIDE, ENABLE),
        mc_make_sec_cfg(BPMPDMAW, NON_SECURE, NO_OVERRIDE, ENABLE),
@@ -190,7 +190,7 @@ const static mc_streamid_security_cfg_t sec_cfgs[] = {
        mc_make_sec_cfg(SDMMCRAB, NON_SECURE, OVERRIDE, ENABLE),
        mc_make_sec_cfg(ETRR, NON_SECURE, OVERRIDE, ENABLE),
        mc_make_sec_cfg(AONR, NON_SECURE, OVERRIDE, ENABLE),
-       mc_make_sec_cfg(APEDMAR, NON_SECURE, OVERRIDE, ENABLE),
+       mc_make_sec_cfg(APEDMAR, NON_SECURE, NO_OVERRIDE, ENABLE),
        mc_make_sec_cfg(SESRD, NON_SECURE, OVERRIDE, ENABLE),
        mc_make_sec_cfg(NVENCSRD, NON_SECURE, NO_OVERRIDE, ENABLE),
        mc_make_sec_cfg(GPUSWR, SECURE, NO_OVERRIDE, DISABLE),